-
Notifications
You must be signed in to change notification settings - Fork 47
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upstream1107 #128
Merged
Schrodinger71
merged 400 commits into
AdventureTimeSS14:master
from
Schrodinger71:upstream1107
Jul 15, 2024
Merged
Upstream1107 #128
Schrodinger71
merged 400 commits into
AdventureTimeSS14:master
from
Schrodinger71:upstream1107
Jul 15, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add Destructible component to BaseMech So all mechs are destructable now
It greatly annoys me in the rare instance I do play.
* Added fovarite button * Some fixes in xaml * added some events for favorite recipes * set methods for presenter * fixes for presenter * added translates * reset seach when you select any category * added some margins * some fixes from compared * fixed PR notes about arrays * deleted controls & margins * did simpleer with arrays * review --------- Co-authored-by: metalgearsloth <[email protected]>
* add textures * add SealingCabinet system * add StoreUnlocker/ObjectiveUnlock system * add plutonium core and nuke core container * make nuke deconstructable * add steal core objective * add core extraction toolbox to new category * typo ops wrench fuel * use queries and resolve, have it resolve instead of using Comp --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* Atmos department rework * move paperwork back to library * Would you believe I forgot a valve? * camer and fore extinguisher wallmounts in new room.
* Ensure trait groups get validated The only validation being done was on the UI. I also made the "Default" group match the PascalCase naming schema so might be a slight breaking change but the original PR only got merged a few days ago. * overwatch
Revert "plutonium core steal objective (#26786)" This reverts commit f6ce072.
Gas lost via wrench/breaking capped
* fix explosion resistance showing 0 values * markup
Miners now can produce a fraction of their SpawnAmount corresponding to the "remaining space" available in their environment according to their MaxExternalPressure and MaxExternalAmount.
Update wizardsDenGateway.toml
Co-authored-by: poeMota <[email protected]>
Co-authored-by: PJBot <[email protected]>
* Oh the possibilities * Merge fixes * Forgot to remote LavaSystem oops * Changed EntityEffectArgs to EntityEffectBaseArgs and EntityEffectReagentArgs * Throw exception for unimplemented effectargs * Remove Json and overrideable datafields * Fix test issues * Actually fix the compiling issue * Fix comments and remove EntityEffectArgs (no longer used, replaced with EntityEffectBaseArgs)
* Fix some job's drobes point light * Fix some job's drobes point light
-1 is a silly API because now you have to handle it everywhere manually instead of using nullability.
…(#29461) * Fix ItemMapper whitelist mispredict when inserting or removing items Makes the ItemMapper MapLayerData available on client so that the client can predict whether an inserted/removed item changes the visibility of a sprite layer. * review --------- Co-authored-by: metalgearsloth <[email protected]>
Fixed whitelist locale
* Character menu asks if you want to save your character on exit * Fix * Another fix, little mistake by me * Update Content.Client/Lobby/UI/CharacterSetupGuiSavePanel.xaml.cs --------- Co-authored-by: metalgearsloth <[email protected]>
* Revert "SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) (#28763)" This reverts commit 3ceb92a. * Revert configs * Oops
…ream-sync # Conflicts: # .github/labeler.yml # Content.Server/Administration/Systems/AdminSystem.cs # Content.Shared/Chat/TypingIndicator/TypingChangedEvent.cs
…am-sync # Conflicts: # Resources/Locale/ru-RU/administration/ui/tabs/babyjail-tab.ftl
Co-authored-by: lzk <[email protected]>
…tion-14 into upstream1107
github-actions
bot
added
Changes: UI
Изменение интерфейса
Changes: Sprites
Изменение спрайтов
Changes: Map
Изменение карт
Changes: Localization
Изменение локализации
labels
Jul 12, 2024
Merge branch 'master' of https://github.com/space-syndicate/space-station-14 into upstream1107
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…into upstream1107
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Changes: Localization
Изменение локализации
Changes: Map
Изменение карт
Changes: Sprites
Изменение спрайтов
Changes: UI
Изменение интерфейса
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Описание PR
Подтянул актуалочку мастера корвухов
🆑 Шрёдька